cssvalue: At cycle detection to color resolving

The following CSS would infloop:

@define-color self @self

as it would infinitely lookup the color named "self" and try to resolve
it. This patch adds detection of such cycles to the resolve function by
keeping a list of currently resolving colors in the cycle_list variable.

diff --git a/gtk/deprecated/gtkgradient.c b/gtk/deprecated/gtkgradient.c
index 78cf7a3bfc4308fcff10818693c53a028b61cf3b..9a0dd64d3cbcbfc5955e4ce8dbdd7aef2d981cbd 100644 (file)
--- a/gtk/deprecated/gtkgradient.c
+++ b/gtk/deprecated/gtkgradient.c
@@ -342,7 +342,8 @@ _gtk_gradient_resolve_full (GtkGradient             *gradient,
                                           provider,
                                           _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
                                           GTK_CSS_DEPENDS_ON_COLOR,
-                                          &stop_deps);
+                                          &stop_deps,
+                                          NULL);
       if (val)
         {
           rgba = *_gtk_css_rgba_value_get_rgba (val);

diff --git a/gtk/deprecated/gtksymboliccolor.c b/gtk/deprecated/gtksymboliccolor.c
index db85a3b1b64b6046849344b114c2b0641a0d0820..ef60974077331431b1352ab16c9fff023e66ee71 100644 (file)
--- a/gtk/deprecated/gtksymboliccolor.c
+++ b/gtk/deprecated/gtksymboliccolor.c
@@ -307,6 +307,7 @@ gtk_symbolic_color_resolve (GtkSymbolicColor   *color,
                                     GTK_STYLE_PROVIDER_PRIVATE (props),
                                     current,
                                     0,
+                                    NULL,
                                     NULL);
   _gtk_css_value_unref (current);
   if (v == NULL)

diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c
index 64933bde585a7086ec19f70794e8327e65d1d036..d523fe82d44a076b950ebb01362f39a309b809f0 100644 (file)
--- a/gtk/gtkcsscolorvalue.c
+++ b/gtk/gtkcsscolorvalue.c
@@ -140,7 +140,8 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
                               GtkStyleProviderPrivate *provider,
                               GtkCssValue             *current,
                               GtkCssDependencies       current_deps,
-                              GtkCssDependencies      *dependencies)
+                              GtkCssDependencies      *dependencies,
+                              GSList                  *cycle_list)
 {
   GtkCssDependencies unused;
   GtkCssValue *value;
@@ -160,12 +161,18 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
     case COLOR_TYPE_NAME:
       {
        GtkCssValue *named;
+        GSList cycle = { color, cycle_list };
+
+        /* If color exists in cycle_list, we're currently resolving it.
+         * So we've detected a cycle. */
+        if (g_slist_find (cycle_list, color))
+          return NULL;
 
         named = _gtk_style_provider_private_get_color (provider, color->sym_col.name);
        if (named == NULL)
          return NULL;
 
-        value = _gtk_css_color_value_resolve (named, provider, current, current_deps, dependencies);
+        value = _gtk_css_color_value_resolve (named, provider, current, current_deps, dependencies, &cycle);
        if (value == NULL)
          return NULL;
       }
@@ -177,7 +184,7 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
         GtkHSLA hsla;
        GdkRGBA shade;
 
-       val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, current_deps, dependencies);
+       val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, current_deps, dependencies, cycle_list);
        if (val == NULL)
          return NULL;
 
@@ -199,7 +206,7 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
        GtkCssValue *val;
        GdkRGBA alpha;
 
-       val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, current_deps, dependencies);
+       val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, current_deps, dependencies, cycle_list);
        if (val == NULL)
          return NULL;
 
@@ -219,13 +226,13 @@ _gtk_css_color_value_resolve (GtkCssValue             *color,
        GdkRGBA color1, color2, res;
         GtkCssDependencies dep1, dep2;
 
-       val = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, current_deps, &dep1);
+       val = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, current_deps, &dep1, cycle_list);
        if (val == NULL)
          return NULL;
        color1 = *_gtk_css_rgba_value_get_rgba (val);
        _gtk_css_value_unref (val);
 
-       val = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, current_deps, &dep2);
+       val = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, current_deps, &dep2, cycle_list);
        if (val == NULL)
          return NULL;
        color2 = *_gtk_css_rgba_value_get_rgba (val);
@@ -324,7 +331,8 @@ gtk_css_value_color_compute (GtkCssValue             *value,
                                            provider,
                                            current,
                                            current_deps,
-                                           dependencies);
+                                           dependencies,
+                                           NULL);
 
   if (resolved == NULL)
     return gtk_css_value_color_get_fallback (property_id, provider, values, parent_values);

diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h
index 06e6a1cd0ec1bf81f9bbeea4d60a2f542f8eeb7c..4392a0799d1ce32a2852e6292c73ebadca84bf7e 100644 (file)
--- a/gtk/gtkcsscolorvalueprivate.h
+++ b/gtk/gtkcsscolorvalueprivate.h
@@ -47,7 +47,8 @@ GtkCssValue *   _gtk_css_color_value_resolve            (GtkCssValue
                                                          GtkStyleProviderPrivate *provider,
                                                          GtkCssValue             *current,
                                                          GtkCssDependencies       current_deps,
-                                                         GtkCssDependencies      *dependencies);
+                                                         GtkCssDependencies      *dependencies,
+                                                         GSList                  *cycle_list);
 
 
 G_END_DECLS

diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index af1c1b1b6f41262fdd95bc713c15bdbcf595ebde..1dff511d597b9eac26facfd5f3b36de98df4cb22 100644 (file)
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -234,7 +234,8 @@ rgba_value_compute (GtkStyleProviderPrivate *provider,
                                           provider,
                                           _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
                                           GTK_CSS_DEPENDS_ON_COLOR,
-                                          dependencies);
+                                          dependencies,
+                                          NULL);
       if (val != NULL)
         {
           rgba = *_gtk_css_rgba_value_get_rgba (val);
@@ -323,7 +324,8 @@ color_value_compute (GtkStyleProviderPrivate *provider,
                                           provider,
                                           _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
                                           GTK_CSS_DEPENDS_ON_COLOR,
-                                          dependencies);
+                                          dependencies,
+                                          NULL);
       if (val != NULL)
         {
           const GdkRGBA *rgba = _gtk_css_rgba_value_get_rgba (val);

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index f2c79c8d2e893425e5df7562e0cc2b727ac38fad..0a0f4b1fce26437c91fd88fe36bb81f83a43a8ff 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -2827,7 +2827,8 @@ _gtk_style_context_resolve_color (GtkStyleContext    *context,
                                       GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade),
                                       _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR),
                                       GTK_CSS_DEPENDS_ON_COLOR,
-                                      dependencies);
+                                      dependencies,
+                                      NULL);
   if (val == NULL)
     return FALSE;